Adjusted collection algorithm

https://jirasul.stanford.edu/jira/browse/INDEX-122

@ndushay
this could be an elsif  fwiw ...