Add more genres

Change-Id: I9476bc4775c726c623cbfa48e86c16a28577bdc2