color fix and partial search implemnetaion