IMG-618 revise filter options