Fix XSLT2 bug in mappull #1813
Fix XSLT2 bug in topic pull #1814