We are working on expanding the parser function so you can for example use {{#property:headquarter location}} instead of {{#property:p159}}. The complete plan for this is here.