2287447 by neardark: cleaned up tags