Reformated queries for clarity
Added 1 new query, fixed old query