Moved string filter code to filter package and tweaked the existing filters