added filter for "optional