query cleanup,q15&18 update, added sources for java files