Updates to search & CT

major performance improvements to both.