AccountMatcher logic fixed for current stage