Revert "Few updates on set/where generate func."

This reverts commit 768ada969d15150d02ae9adb290f56c0ca00c6c0.