schema 1.1 regex updates by Phil, closes #159
speedup