Addressing issue #8, also moved search drtv into spearate file.