PAHMA-814, PAHMA-815: can't update empty object count, deleted locations showing in term matching