Update pg
Default scope on matches and use reorder where necessary.