Improved the search commands speed by expanding the data needed in the initial call.