committing before merge
changing AWS API to match the query Object comming from the UI