fixed insert 
need to do smart find