Reduce even more query to Date and DateTime field