Minor fixes for query schema object