code review: moved custom scopes to models