Fixing flavor query and keypair info at right place.

Change-Id: I8357bd7ddd3fa5e7a84720a23db51e1f1b15f2d1