add handler for grammarexp and touchup sub names