Merge pull request #356 from sppigot/2.10.x

Move metadata.select calls outside of loop that sets checkboxes