fix elasticsearch mapping
refactor and enrich search output