added limits and indexes