Changed to elasticsearch from jpa