Small refactor and get filters working.