tweak completions queries and schema