add in all the possible filter fields #60