Filter: on query, add ToDo to implement redirection from sources to destinations