#744, #737: Template preselect updated. Entity tracking service updated.