Replace dropdown with search i.e. picker: to be tested
Fix search state issues