upgrade objectid; fix dispatch by collection