Comment on Remove usage of deprecated entity.query service