This boundary is messed up, I am trying to make them NAMRIA-based boundaries

I adjusted the Mandaluyong-Manila boundary to match the jurisdiction but when I search "Santa Ana, Manila", I see a boundary overlap in the boundaries of Santa Ana in the San Juan River, can anyone fix this.

I think I ruined Paseo Palisoc Circle, I was trying to make it based off ESRI’s Satellite Imagery, since it’s already destroyed by land reclamation.

This is the Annex Building, It’s a separate building from the Main Building.

There many missing buildings in Green Valley.