Clear more properties (1 to 99)
added check for empty id
different parameter handling