Solved issue which occurs when filtering