properly reset order on basket creation and find order more restrictively (changes 6f6a709a6a1a94b4094cd86b8bd11e27fcbb7af9)