Actually fixes bug and improves pageview reporting