make models,search work with latest ES document structure