Modularized accordion, improved basic stat query