support switch (fixes #1), fix for escaped @