Custom Groups and Query's disappear if I make changes to them

Steps I took to create:

1. go into Device Search and create Query including IP's for a particular site, Run and save Query.
2. go back to devices and create a new group for that site, select the pre-made query and save the group.
3. Everything is A-OK.

Now here's the problem.

1. I realize the site has another IP Scheme I want to add, or possibly filter so it shows me Servers only.  I go into Device Search, select the existing query, make the changes, run and save it.
2. When I go back to Devices, the Group is still showing the old results rather than the new ones.  If I edit the group, rather than "Select a Query" being selected, "Select the devices/groups from the tree below" is selected and the systems that were originally found are pre-selected.
3. If I move it back to select the equry and next/finish the edit boxes, the group disappears from view.
4. If I go into Device Search, the saved query is gone too.
5. If I close OME and reopen, the group is back, but still with the original results, and the query is still missing.
6. Only way to fix it is to DELETE the group, then create a new Query and then create a new group as in the original steps above.

This has to be a bug right?  Is there any way to keep my queries from disappearing when I make changes to them and have them dynamically continue to update my groups?