Fixed issues with bad requests