Ensure we don't add null entities to search doc list