...G...... [ZBXNEXT-497] tokenizing rewrite