Filter consistency

Apply filter introduced in commit 3a00c89337f349028e88640653e676bef864d215 consistently