Fixed a bunch of stuff to make vocab searching work with sql and tests consistant