Removed double routing + better handling of bad requests