I think you can use pinning to prevent the second scenario, assuming you don't mind the extra manual configuration.