Add changes for new search for blocks