Minor edits for filtering by goals