optimize search handlers and add path table