Base: Relink manual switches and update properly on new load