Improved partial string matching and also fixed save settings issue