Fix for Location criterion in new-style collection missing "Search subfolders" checkbox and multiple selectable folders

Fixes for https://dev.plone.org/ticket/13123. Requires plone.app.querystring branch fix-13251.