Add delete and enhance search