Fix filter

+ coding style issues