query string stuff and movement repair