Added case and number filtering.