Extended MapBased XPath variable and function resolver