Grammar2Jigll updated to work with the new filtering scheme.