Fix for issue #295. Group and image_select fixes. Thanks @vertigo7x!