Hopefully working headers in General stats and temporary fix for general stats wasteful logic