Added conditional GET behaviour