Bug 22509: Add more POD and fix --where