Refactoring. Filter -> Router