searching and creation fixes