Ticket #1158: standardized filters