WT-112 - fixed some settings related bugs