added option to avoid ? entity flags