Fix JS and reduce the timeout for faster response