Random dataset form issue fixes + better GA tracking