LPS-36711 use attributes instead of rewriting the xml
LPS-36711 apply new search container pattern to remove dependency on xmls
LPS-36711 Sort