Finished with new searchbar