Fix filtering.

Also some aesthetic fixes to options tabs.