unbreak various functions broken by unwanted changes of keys in xml