Add count and value fields to result week + group