added support for query parms