Closes #354. Refactored fitler fields

#354