do not fetch q only make sense when the loader will use it (#1032)

do not fetch q only make sense when the loader will use it (#1032) #3458