Fixed issues with showing correct groups when select options required