More data massaging for search/composite