Enhancement: Trailing gaps now filled with NPA