fix location & state filter