Fixed issue with composite filter not displaying properly when legend is added