Changed parsing of new style top page