Fiexed bug, reduced query size