Currently selected filter is unselected when cancel editing is pressed
Fixed merge error