Separated hole filling and polygon approximation for less confusing performance