Removed underscore dependency/Added compare smart query

Going to add support for the ones listed above