[onDemand] Fix Tabing issues

Tidy up the code as I had lots of tabbing issues.

Also, only call findPlayUrl for the Section "Straight off the Telly" as
we can determine the mp4 url for the other sections by using the icon
url.