More comments
Disabled User Selection
Added no date selection