[SPRINTFIX][#49672449] Changed the query to apq to keep conflicts down.