tightened database validation to the default database set