Adding conditional logic to handle sites with non-standard echo queries