rearranged query filters to try to speedup fetch
Rearranged fetch parameters query