search works fairly well now