Rejigged template tags; fixes issue with generic blocks not being editable