Updates for full hashes and search - broken