Some fixes in RichControl and SearchList