Yes, you're right on both!
=)
noun clasues
1. is this clause an object of a preposition
-this mail goes in WHICHEVER box is marked "smith"
2. is this clause a direct object
-the dogs know WHERE the cat often hides.
2 answers
thanks