fixed issues with search