Sujit: more changes to support search api