final doku and query order by month fix