Fix the site list issue which I had noticed for a long time.