Improve more entry URL generator