Improve hiding no data