one more update

@alagu One more update, Let me give a proper patch for the url fix by weekend :)