expand matching to keyword based