Finish working on search page