Updated queries to 'kim-namespace' and improved speed.