uncommented & fixed CTASearch