DNN-3286 Search query sent to Lucene is unoptimized