critical fix for setup-query() mixin