language improvements + expand returns ids