Refactor and store filters