Rudimentary search fixed

Could it be possible to make `search_results` a dict and lookup by key to avoid such loops?