Currently selected show wrong after screensaver

I'm not sure if this is a mediastream bug, or not.
When watching 'The X-Files' if I exit back to the main menu, let the screensaver come on (pictures slideshow if it matters) then from the main menu, go back into tv shows -> title, the selected show is 'The IT Crowd' and not 'The X-Files'.

I'm just wondering how you remember the last selected show. It seems it's matching on 'The ' instead of the whole show (The IT Crowd being the first show in my list that starts with 'The '

I cannot confirm if this is a mediastream or xbmc bug, since I am not currently in front of my xbmc box. I just wanted to post this before I forgot again.

If need be, I can provide a debug log when I get home.