fixed ordering problem and DB send from APIFetch