Bug - Search on main/v6 site shows components that no longer exists

[Venefilyn]

Describe the problem
This is an effect of #4471 where we searched for TextContent on the main site and got information of it existing. Clicking on it showed that it does indeed exist but looking closer it is showing the older v5 layout and displaying a non-outdated component that is superseded by Content -- but without any indication about it

1. Go to search
2. Put in TextContent
3. See result for a component TextContent
4. Click and get the link mentioned above

Expected behavior
Search on main site displays v6 content only (or a subsection at the bottom of all search results on older versions with clear indication of it)

Screenshots