fixes for speeding up handler execution
including path info