Improving the behavior for PDF based collection. DHH-461