Filter handler: various fixes in response to PR comments