added Mel O'Cat's search modifications for v20121225, reverse engineered from jar file