adding better labels and fixing safari parse issue