Added query & underscore.js - refactoring