starting issue #34
work on #34 - additional stored query parameters
#34 fixes