I finally found the issue, in the XML configuration for the table the key was not defined correctly and since the rows had similar data it always returned the first row. After fixing the key definition to include the column ORIGIN_ENTITY_ID it works fine.
Thanks for the help. I found it while redoing the configuration files for the new version.