Improving headeraddpage and headersearch