FEATURE: add site preference for standard subjects, including support for Re

Revision of #2673 (Thanks @peternlewis :heart:)

Fixed broken tests, and added new tests.