Fixed a few bugs with the Website component selector state