fixed a lot of other queries
reduced allowed queries again