Fixed a bug when using vocabulary with Int values
added the changes/history line info
do not call factory multiple times