search by keywords + fix tests