Improve snippet selection