_underscore.js filter added, minor improvements