Create filter further fixed