Add some units to XSAMS
Fix to add semicolon to a sample query only if there is no one at the end.