hopefully final edits to filter handler (doubt it)