P1 of implementing wrapper filter. Fixed filters to not display disabled values.