cleanup some default parameters, most of them are set from (search)
add term-query-test
make (store) take map instead of named arguments