Little codechanges
Fixed an issue with visible data collection.