added timeout to join in JG
added meas_date limit to NN