clean up value filter mapSubset and test

doesn't fix the java7/8 ordering issue, but is generally a good
thing and makes it easier to fix next