Changed sample searches to random order