More preparation for implementation of search