SONAR-3893 Fixed snapshot source and data querying for better performance