Bunch of fixes. Now I need to figure out the search call query syntax.