fixed order_only adding/removing and reporting