[#49672449] Changed the query to apq to keep conflicts down.
Merge pull request #33 from travist/sid-49672449

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