Re-introduces filtering during recovery, which was disabled when the code path for recovery updates and
normal updates was split into two separate ones. Added a unit test to avoid regression.

This fixes #1092