more work on models and elastic search index