Improve behavior without genre