Just in case you didn't see my comment (because it got wiped with the change) -- don't we need to include the active flag as well?