XPath expression not encoded in groovy script editor

Repository query runner preprocesses xpath expression by encoding it with

RepoUtils.encodeXpath(param)

The same does not happen in groovy script editor, thus causing an exception, if any node in expression starts with number.

Shall we use this encoding consistently. The client is confused by the fact that the same xpath query gets executed in repository query runner, but not in groovy script editor.

Reproduction path:
1. build a project from archetype mentioned on onehippo.org (based on hippo-cms7-release 7.9.7 )
2. in groovy script editor create a new script taking a query e.g. "//2015" and see the exception