Performance is still not optimal, but should be better than before. At
least it does not assume that movements will be in predicate table.