LIBSRVSRCHDISCOV-522: Updated the WSLS code to support hierarchical organization and to reflect some of the desired improvements.