Realised I should be short circuiting this new switch case so the parser works as it did before I added it. The system should now work as it did pre switch case addition.