SONAR-4851 Add filter id, add full list of choices for select filters