AHC compatibility changes: remove query string before reconnecting