Updated internal channels playpath to work well with XBMC favourite system. Minor code refactor as well