Restructure Inquiry Space grouping