Album filtering issues (I did something can't cant figure it out)

Hello, 

I have some how messed up what pictures are showing up in the filmstrip at the bottom of the screen in lightroom.  I'm not sure what I did but I cannot get it back to how it was even after resetting the preferences when starting up lightroom.

I work through all of the photos in my album in the film strip. From there, I delete items and then edit the pictures like normal. Every once in a while, I need to add some text, so I bring it over to Photoshop and add text. Then, it copies the edits back down to Lightroom and replaces the existing photo (sometimes the replacement photo will be located on the far right after it comes back from Lightroom, but the original will disappear).
 Now, when I look at the full album, it may only show the photos that I converted to Photoshop and none of the ones that just had edits in Lightroom. So, basically, all photos will have a number 2 in the top right.

If I start looking at album filtering and do "editing = yes" and "Type = Raw," it will show all the photos without the additional text (it shows the photo's pretext added).   If I do "editing = yes" and "type = Photo" it does include the ones I added text to at the end (or if I did noise reduction and it has to make a copy of the photo for that etc.).  So it has a good amount of duplicate photos which just makes exporting a bit painful as I'm exporting a bunch of redundant pictures that I have to go delete.

I'm not sure how to reset the filtering to the "latest" version of each picture to remove the duplicates. Hopefully, this makes sense.