Changed searching to use keywords