more tweaking of regexp
more tweaking of regexp for class/id filtering