Use 'filter templates' like {{self}} appropriately

Change-Id: Ib8d0dc97b7a1a54d51568f6c8b3c442846b9d1d0