Add none exception handling in entity_list template
Return block separation by type in base_edit template