0.06 20.05.2013: allow same term to be loaded from several origins
+ fix some parsing bugs