improved URL extraction forl current classes