moved sql preparation around.  this seems to appease travis-ci.
fixed wrong name for search extensions
fixed merge conflict