Add delete
Fix when empty results