Settings bug fixes
Signed-off-by: denis-m-tyurin <denis.m.turin@gmail.com>
Signed-off-by: denis-m-tyurin <denis.m.turin@gmail.com>