Important update to parse correctly the <where> tag during exploitation phase.

Minor code cleanup.