WIP: preview_handler changes to support Locators.