MInor improvements
Fixed the SQL row limit