Merge "Fix bugs on filters"