Removed unneeded query parameters from certain GET requests
Reorganised the query paramater listings