Added support for advanced server filtering.