custom fields and report filters

@anandpdoshi please merge