Problem happened when we tried to extend the data list from the dict, it just uses the keynames. Also if we have only one entry return the raw dict instead of a list