key_commit: tweaks for code review and add indexes to aamaster check