Bugs fix && group validation added