Make filterWidget multi instance ready
Use unique id for filter widget selection
Refactoring: Create separate method createFilterQueryString
Merge branch 'APD-167-BOZ' into develop