If we get a dup, clear the default value since we can’t trust it

Removed redundant counter while at it.

Also updated parser for new xml format

Action passed in in order to make X in title bar close work