completed fixed query 1 and 3, need to check buildings for t6; TODO: fixed queries 2,4,5