changed search functions
resolving merge conflicts after search push