Some fixes search