Remove hard-coded url with reversing