Fix filter store and save on escape