use capture instead of layout-hack to allow deface overrides
fix current_orders (complements 76d46865b0e330e9c371cedbf72c1fb3f42caa5e)