Fixed enter key and genre list