Always order by menu order (ascending).  This might fix #1.

At least for me now it does what I want / need.  Close (with or without merging) at will.  Thanks for your work!