Bug fix: Remove query string from PATH