Adding public_search and fork