More work on time query