Fix awc, gp, and block filtering in HSR
Merge pull request #4349 from dimagi/opm

Fix awc, gp, and block filtering in HSR