Changes to header, upload_search and search