Polishing posxml completion rules