Adding One Or Multiple Contacts With Invalid JIDs Causes Issues In Roster

Adding another invalid contact creates 2 unfiled groups in the roster rather than showing to invalid contacts under a single unfiled group.
Adding a 3rd invalid contact causes the 2nd unfiled contact to move to the Offline Group in roster while the first invalid contact remains under "unfiled" group. The 3rd invalid contact disappears completely.
when user logs out and logs in again, the first two contacts are now under "unfiled" group, but the last added invalid contact is no where to be found.