Fixed bug due to merging
Updated initial data to match the new models structure
Fixed sorting by expiration date