crash fix
untested edited search implementation
check