Refactored concerns, search and list