Fixed several issues with figures - Don't output tags when no content - Match up correct fields for output - Use same template helpers as template tags - much more readable and terse.
Fixed several issues with figures
- Don't output tags when no content
- Match up correct fields for output
- Use same template helpers as template tags - much more readable and terse.

dregula/Annotum,dregula/Annotum,dregula/Annotum