Clean up and fix preference domain routing