Change currentWeek query to take results into account, fix 'correct' field on picks results