Some changes to redirect properly in case of wrong url call.