redo queries to look for Deleted !=true