Parametric filter functions and some fixes