Added loading
Merging, fixed searching