fix dynamic location/class/time selection