Fixed the surrogate filtering to make more sense