updating Loader and FastQuery