Modified QueryLoader