BBC - Better handling of night and evening in query