[DICTIONARY] fix bug with storing definitions
[REPORT] better solve report with definitions