[642] Updated API to use search