[DEV-1996] Add hacky fixes for collapse dropdown and search dropdown.