PLD: add remove id, fixes to template selectors