Fixed templates on organization error (entry/table)