Fixed duplicates from API