Changing tag evaluation method to match when conditional method