Better attributes, better infobox detection