On an side note, earlier in the thread I posted some characters who were supposed to show up. List is working out so far except for Aladdin, Jafar, and Ariel. I'm surprised Ariel didn't show up already since they specifically mentioned that only a mermaid could get to the squid ink, which made me think they'd have to find her but then we find out it's already in Rumple's cell, so I guess that will be pushed to a flashback or something in the spring segment.
As for the Aladdin crew, maybe Agrabah will be visited on Aurora's arc.