Added support for query params + return on empty query string