model refactored, database rows limit