Correctly revert to current tv or radio bouquet
 Streamline userbouquet parsing coding