Proper generation of tostring values
Add proper xpaths to output