VID-1502 adding tracking to placeholders and some code cleanup