Updated query functions to allow paging on filtered results; custom order of locations
Merge branch 'release/2.9.0'