updated condition strings to better match yahoo's condition types

close #14