Avoid losing filters when going into occur-edit-mode

Change-Id: I856fc8ab6fb6fb9b1b6a26b59da3a4622f38494f