re-factoring, adding cc/tags filters..