Filter function Redone ( Bugfixes & Design )