Working on ParseHTML filter + Some Cleanups