Fix urls
Add counts