fixed back button issue
Merge branch '910_filtering' of github.com:thecartercenter/eos into 910_filtering