[IMP] use limit on search instead of indexing the first item