added more filters and fields