Fixing related entity filter