Added body-parser and query-parser fix