refactored filtering parameters