removed long query string issue
refactored filter handling in controller