Added keyword-search -> changed the API