Refinement of settings changes handling