us42650 fixed stuff from cr and table searching

us42650 fixed stuff from cr and table searching v2