Issues #638 and #617

Issue #638  - pipe number mask is now working and validation is erased only in  IsEdit mode
Issue #617 - fixed