Filterbox and Template dialog changes