updated filters and bug fixing