Maked the filtering for 'None' option generic