Fixing filter bug
Adding additional type handling for dropdowns