[ISSUE-2] More filters and bug fix