* Fixes in Filters with Multiple Choices
* Code Cleanup