Move watermask check to only filter new pairs. Improve edge creation so edge of frame is not included.