Condensed if statements into a for loop.
Merge pull request #870 from DirectEmployers/mpt-ux-filter

Change Tag Filtering and Refactor A Bit