Cleanup, helper function to check if its a filter, add date range to form builder