MOE-13: Filter is now optional