Add static resource
Fix template to handle nulls