Search-reverted back to lucene as Elastic Search was having some issues