Fix status.
Update templates - flag check to be removed soon.