Fix header and search