Closes #354. Refactored filter fields.