#2810 #2815 make parser work with old and new web page