Better hash search handling