not longer as dirty, working!, more white-list-tags