chore(queries): migrate queries to update query classes in engine

related to CAM-2939