fixed handler search