Fixed filter and/or button once more
Merge pull request #2488 from ten24/feature-4-filterAndOrButton

Fixed filter and/or button once more