Fixes on the Settings and Filters