Updated snapsearcher code