avoiding duplications between application.xql and autocomplete.xql; continuation of svn 18774