Improve performance of TiiT settings