changes for cwbquery timeout block