MAFA-3: added functionality to combination filter with stores

Signed-off-by: unknown <cnwnh1@cnwcb5a.cnw.co.nz>
MAFA-3: Made changes to filterBuilder to handle empty filters from the UI

Signed-off-by: unknown <cnwnh1@cnwcb5a.cnw.co.nz>