push type autodetection improved