Add select2 and clean up search dropdowns