Fixed ami-id retrieveing, and bundle name construction
Merge branch 'fix/ami-id'