Fixes loading of entities
Re-indents template and enables selection of entity