refactored model filter
refactored structure