added support for query string username