Refactor search to remove lists of single value dicts between server and client.