Fix major discussion page perf issue