Add setting to remember queries between restarts
Enable this by default
Merge branch 'master' into bd808