Fix Language Categories problem

Fixed Issues:
 - #275 
 - #276 
 - #277