Close GH-1: detect more xml tags..