LPS-38038 Should distinct on entryId instead of tagId/categoryId