Changed regex for pagename, section optional