Revert "reverted the hash-table search grid as it also caused some errors"

This reverts commit a801d83505e79fdba564b8ed808e24bfa89ec3a9.