Moved filter logic to project model