Updated the way that the model is generating URLs to be more click-friendly