Fix retrieving of data, optimize product listing