added dynamic query key handling
commented out style checking in pom

TODO:	test update
	apply checkstyle