Further work on search. Now only the button is missing