Fixed a few bugs with filter, fixed restul delete