improve and clean grep and grok filters