Changed filter and grating to use combo boxes