Fixed cascading and circular related entries