Fixed creating/updating system settings. Fixed searching empty string.
Fixed creating/updating, searching empty string

Merge remote-tracking branch 'origin/pr/622' into develop

* origin/pr/622:
  Fixed creating/updating system settings. Fixed searching empty string.