Fixed %genre% and added option for single track albums