Make parsing of entity names more robust, less dependent on CSS classnames
Add 2010 and 2011 budget data