Fix expansion bug: Expansion of annotation maps used wrong property