APD-187: Fix query syntax for subsectors
Merge branch 'APD-187-BOZ' into develop