#629984 by dagmar: Ensure that row styles are relationship safe and add fields they need to the query, such as nids and cids.
