Solved some problems searching keyword introduced in the previous commit.