Followup fixes/cleanups for last commit
The index changes of the text fields broke the call map context menu