Merge branch 'js/filter-options-should-use-plain-int'