fuller database and special case checks