Additional debugging and improvement to query for Query completion check.
new release 0.1.2