Adding fix to keep date when removing type filter