in groovy script editor query fields are confusing

There have been several cases already, when xpath expression is put in "path" field resulting in exception. Apparently user experience can be improved here.

IMO in the repository servlet it is more clear what is meant by each field. So labels can be adjusted accordingly.

Alternatively there may be a drop down, where user consciously selects a type of query. Or There may be a single field, and on the background we recognize the the query type.