Reduce empty database entries; #6