Fixed entry edit bugs during lunch