fixed issues with quick find implementation