Fixed issue #8 - statistics queried on every visibility change