First round at updating combo logic in the filter builder (not working).