Cleanup select-time template. Improve configuration.