Continue to extend searchning functionality