CORE-178 Apply same fix for modal controller as for advanced search controller.