work on #34 - additional stored query parameters