Fixed issue where all data was being shown 4 times