NEON-967 handling null properly for shark queries
NEON-968 handling null times