Need to fix searching part