flat structure switched back with ability to accept short IDs