Port watermldata also to qgsxmldata, fix some bugs