- Fix GS4 querying