switch case modified in match fields