fix predicates, now with and/or and the right Dynamo API restrictions