Fixed some issues after merging in ievv_elasticsearch2.
Fixed some issues after merging in ievv_elasticsearch2.

appressoas/ievv_opensource,appressoas/ievv_opensource,appressoas/ievv_opensource,appressoas/ievv_opensource,appressoas/ievv_opensource