Fixed all the entries on the list, more details in tag