More fixes for com_search