style updates, search api
merge conflict fixes