removed filters and changed some var naming
Merge remote-tracking branch 'origin/jsfunctions' into jsfunctions