FilterJS and Tagging added #13 #16