focus on click & date improvement