monthly report queries refactored