[2.0] Grammar rule fixes to prevent possibility to do key=field=identifier as a correct parseable grammar