CLSN-2165 move all queries to session.query from session.queryover