Refactor filters and routes once more