Fix filter
Add templates for goji framework