refactor keyword matching for request
refactoring interaction model and tests