fix execution and jdbc store
tokenlist and jdbc fixes