[modularity] Querying modular content — workaround