Adding dynamic filtering support for all queries
reverting to single framework builds for simplicity