Make option filtering more readable