This should get moved to com_search