Made the regexs for page data better