Fixed mux, added not found support