fixes for new timestamps, stop selectors