proper index support, underscores in ids, and proper location reporting