Feature/search master