Added configuration option for upstream if

Plus fixed automatic enabling of sites (and removal of default site).