Improve to treat arguments and logging
Change form value check to non-negative integer