queries and fixes 2