start adding support for keyword searches