Making instances of both kinds searchable and making the links for the search results link back to the searched for instance
Merge remote-tracking branch 'origin/master'