Changed AWS key path
Changed format in one query