Move some more templates into assets/mustache
Move all templates known to be used to assets/mustache
Fix issue in multi-type selector