Used values instead of bits for modify filter options

This has long be a TODO, opportunistically done now because the
compiled/selfie magic numbers had to be changed in another commit.