Issue #2680405 by miiimooo, jjcarrion, drunken monkey, yongt9412: Fixed indexing of non-base fields of related entities.