Bug fix with supporting Site config in cli mode