Fix order of array + empty if not exists