Empty database_output calls accounted for