Can this part be refactored as you did above for EMs? It would seem to me that this code doesn't cover the case where you want to show deleted Equipment Items for a specific Equipment Model.