- refactor lucene + gremliny query to additional query plugins