End response correctly
Add back no match handler
Small sanity