Filter options direct. & fix for dropdown filters