JS-santization of filter options before displaying them FIX 2.2
Merge