Prepare filter functions to be more dynamic...