Fixes for query string and capitalisation. Thanks AWS.