Fixes #570 select generation to honor timeformat