Make a better query loader