Strip out the old, hacky entity/agency search.