fixed issue with stage 1's queries