Fix external search tests; Maybe[] more fields to construct external search results