Removed underscore dependency/Added compare smart query

(Admittedly only *more* of the whole gamut, not *all* :) )