optimized imports ; enhanced ElasticBaseDao ; calendar search wip