Fixes #1509

Conflicts:
	web-app/js/portal/filter/BaseFilterPanel.js
	web-app/js/portal/filter/ComboFilterPanel.js