Fixes/rewrites for 'dublicate entry' bug