Add new search behaviour to modals also