Revert "removed where option"

This reverts commit 987a7c2102173e3beff02a206aa779353905c1a7.