Change Entities filters to use grep, Add optional block argument