Fixing overlapment tests in both lookup and store queries.
Fixing missing default config values.