updating queries to match OpenSIS 5.3