Adds further user input checks in REST