Updates to check for csv output and checking for /data page