simpler queries
tiny change