bugfixes for primary input validation