List by relevance + refactor