move handler_wrap to where it's actually filtered
make x00 handler work