[BAD/DO NOT MERGE]Added logic to catch span and div tags

Bad changes made at 263. Wrong fork. Darn website.