template fix
defualt entity fix