Changes for GOM and empty VOD urls