Database to v6; flesh out a lot of Database.search().