Merge updateEntrySilent
Bug fix
Remove space lines