BZ_1080171 - defer adding of "WHERE" keyword ...

...until we know that it is needed.

Related to https://bugzilla.redhat.com/show_bug.cgi?id=1080171