Initial fix for Bug#974692 we have prefix/suffix issue with url