fixes for non-sequential search results