removed binding and cleaned up search