better formatting of Month and Year report query fields