Major update to WebFX parsing