#490 - Don't index deleted content items.
Made empty row check a bit more consistent with rest of code base