Removed break before button; Added metadata filter