Added shape id to xml
Fixed marker set overlap properly