Bug fixes for subscription selection