0398: code cleanup
0399: save combineOffsetAutoMode in xml
0400: improve isField query accuracy and performance
0401: mode2: move targets to table system