Add rough plural and empty input checks