changed combo-search according to new specs