Fixes issue 13 and also tidies up toggling the controls of searchbox.