html parsing improved