Improve statistik query performance for YEAR
Improve statistics query performance for MONTH
Fix layout