Search capabilities and cleaned up netblock/subnet handling.