fix date.on query. Better tag handling.