- Added limit where it should stop creating a select