Filter Values recreation fix