server-side parsing and ebnf fix