Improve search logic nesting

Allow moving of search conditions into and out of groups.
Adding a group to an existing search currently requires re-creating any items that must be grouped. Adding some sort of capability to move them around within a search would be great!