Add filter logic for subsectors
Merge branch 'APD-79-BOZ-Subsector' into develop