Refactored search list.