Improve array to filter on array and default choice