Fix timekey generation

eg. Min10_10 should be Min10_15

Redmine #3215 (internal)