ami config updated for registry, graph query more flexible