Reworking urls to work with real data