More refactoring of the adv. search result data format