Fix group mask sampling and display