Correctly change return key type when self-hosted site selected