Improved the filtering so it only filters for the target slot and
current edit revision.