plugin xml corrections (refactor)