[DEV] better display of operator and some other special case