Pruned some dead code, tweaks to geosearch, removed unneeded caCh variable
caCh -> highlighter