Fix site setting loading. Finish update to 1.3.5.