NYC’s Waldorf Astoria isn’t in Astoria but Astoria, Queens IS in NYC!(Or something like that)
Queens is indeed still in NYC, but I’m pretty sure the Waldorf-Asoria of legend has always been in Manhattan, which is not part of Queens.