Fix bug when filtering with multiple properties from single field
Merge branch 'shop' of github.com:osen-web-development/cmf into shop