fix issue with out of sync entries in Feed xml model

and add regression test