Some unstable changes to url handling and new count helper