modified milestone query