fix: Ensured all returns that return a list, return a list every time

fix: Ensured all returns that return a list, return a list every time #173