Python 2.5 with statement handling
Local search hotfix

This fixes local search at the cost of no work in progress overlay. For a real fix, it should be converted to the nex provider framework.