Persistently delete query + Improve animation -- Related to #1297