Removed underscore dependency/Added compare smart query