Feature/improve search