some minor changes to db searching resulting from the structural changes