Fix for empty database result change in 3.0