fix problem with add-button when the first click will be performed
fix pattern for empty values