Fix choice filtering in behat