Add changes for new search for blocks

should we really keep it here?