Changed default settings
Fixed an issue when updating data