Grammar type fields not needed.  Regex digit tweak.
Added query capability.