Fix URL length bug