Replaced null check for filter extistence with Option.