Updating the collection forms to support unit predicate. DHH-255