SPOT-619: template tweak fixed issue.  Now all buildings load