Yes. this exact change is on our list of things to do. It is high on our priority list as well since without these tweaks the data is not relevant as it should be.