Demo page - invalid url fixes