Handle exceptional case of name but no quote

hacky but works for now
Saneify template logic

Much more readable :)
Revert 610dee1..e4de468

This rolls back to commit 610dee105c8fa78ba5b303c6da5277003b53f7dc.
Merge branch 'master' into backend
Revert "Merge branch 'master' into backend"

This reverts commit 6597fcb6c286868251e5778cec118ed39be809e8, reversing
changes made to cee94a3365b3602f1bfbc5c15a234b93b8cd1949.
Revert "Revert 610dee1..e4de468"

This reverts commit e8a83eccc4d0884a23788aa160b25a4b11527f90, reversing
changes made to e4de4688b652ff86709c2e8758d0bcac19dad4bd.
Revert cee94a3..06676e8

This rolls back to commit cee94a3365b3602f1bfbc5c15a234b93b8cd1949.
Merge branch 'backend'