[BUGFIX] ReferenceIndex/CommandMap flaws

Change-Id: Ifb8acfa8f4a9b75820878f0d9e5ce6e71e3f4e35