- Fix variable context for $query