Let's make the search more generic