Added additional conditional statements in Time on Task / Time Logged calculation