Improving now playing logic