Fixes #5708 search supports multiple comments on the same entity