add basis of site-id and custom-url support