Trim filter data, if needed
Merge branch 'filtering' of github.com:symphonycms/symphony-2 into filtering