Fix message searching on list and remove