Fixed Requestor and Where methods

Now they work as expected