[MOD] Fixed bug in xquery-module.
[MOD] More work on indexes done.