Fixes for Python 2.7.8 due to differences in the internal html/xml parser
More stable find operation